Revision: tlacontrib--ddaa--1.2--patch-22
Archive: ddaa@ddaa.net--2004
Creator: David Allouche <david@allouche.net>
Date: Thu Apr  1 20:11:26 CEST 2004
Standard-date: 2004-04-01 18:11:26 GMT
Modified-files: tlash/tlash.d/features
New-patches: ddaa@ddaa.net--2004/tlacontrib--ddaa--1.2--patch-22
Summary: merge-conflicts sanity, merge-without

Add a sanity test to handle replay problems in merge-conflicts.

merge-without: same logic as merge-conflicts, but saves all the
undoing and redoing and expects no conflicts.
